Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-328

diff --cc admin/nt/README-ftp-server
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/info.el
Simple merge

diff --cc lisp/term/w32-win.el
Simple merge

diff --cc make-dist
Simple merge

diff --cc src/keyboard.c
Simple merge